From c18f7da40d5bcd0700287b006ccde7b797d7d1db Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 10 Jan 2006 16:38:26 +0000 Subject: [PATCH] Implement local-only atoms. 2006-01-10 Anders Carlsson * gdk/quartz/gdkproperty-quartz.c: (ensure_atom_tables): (intern_atom_internal): (gdk_atom_intern): (gdk_atom_intern_static_string): (gdk_atom_name): Implement local-only atoms. --- ChangeLog | 10 +++ ChangeLog.pre-2-10 | 10 +++ gdk/quartz/gdkproperty-quartz.c | 146 +++++++++++++++++++++++++++++--- 3 files changed, 155 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5889f535f2..001b819339 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-01-10 Anders Carlsson + + * gdk/quartz/gdkproperty-quartz.c: + (ensure_atom_tables): + (intern_atom_internal): + (gdk_atom_intern): + (gdk_atom_intern_static_string): + (gdk_atom_name): + Implement local-only atoms. + 2006-01-09 Matthias Clasen * gdk/gdkgc.c (gc_get_foreground): Correct a warning. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5889f535f2..001b819339 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2006-01-10 Anders Carlsson + + * gdk/quartz/gdkproperty-quartz.c: + (ensure_atom_tables): + (intern_atom_internal): + (gdk_atom_intern): + (gdk_atom_intern_static_string): + (gdk_atom_name): + Implement local-only atoms. + 2006-01-09 Matthias Clasen * gdk/gdkgc.c (gc_get_foreground): Correct a warning. diff --git a/gdk/quartz/gdkproperty-quartz.c b/gdk/quartz/gdkproperty-quartz.c index e0da152141..07fdbafcee 100644 --- a/gdk/quartz/gdkproperty-quartz.c +++ b/gdk/quartz/gdkproperty-quartz.c @@ -22,31 +22,155 @@ #include "gdkproperty.h" -GdkAtom -gdk_atom_intern (const gchar *atom_name, - gboolean only_if_exists) +static GHashTable *names_to_atoms; +static GPtrArray *atoms_to_names; + +static const gchar xatoms_string[] = + /* These are all the standard predefined X atoms */ + "NONE\0" + "PRIMARY\0" + "SECONDARY\0" + "ARC\0" + "ATOM\0" + "BITMAP\0" + "CARDINAL\0" + "COLORMAP\0" + "CURSOR\0" + "CUT_BUFFER0\0" + "CUT_BUFFER1\0" + "CUT_BUFFER2\0" + "CUT_BUFFER3\0" + "CUT_BUFFER4\0" + "CUT_BUFFER5\0" + "CUT_BUFFER6\0" + "CUT_BUFFER7\0" + "DRAWABLE\0" + "FONT\0" + "INTEGER\0" + "PIXMAP\0" + "POINT\0" + "RECTANGLE\0" + "RESOURCE_MANAGER\0" + "RGB_COLOR_MAP\0" + "RGB_BEST_MAP\0" + "RGB_BLUE_MAP\0" + "RGB_DEFAULT_MAP\0" + "RGB_GRAY_MAP\0" + "RGB_GREEN_MAP\0" + "RGB_RED_MAP\0" + "STRING\0" + "VISUALID\0" + "WINDOW\0" + "WM_COMMAND\0" + "WM_HINTS\0" + "WM_CLIENT_MACHINE\0" + "WM_ICON_NAME\0" + "WM_ICON_SIZE\0" + "WM_NAME\0" + "WM_NORMAL_HINTS\0" + "WM_SIZE_HINTS\0" + "WM_ZOOM_HINTS\0" + "MIN_SPACE\0" + "NORM_SPACE\0" + "MAX_SPACE\0" + "END_SPACE\0" + "SUPERSCRIPT_X\0" + "SUPERSCRIPT_Y\0" + "SUBSCRIPT_X\0" + "SUBSCRIPT_Y\0" + "UNDERLINE_POSITION\0" + "UNDERLINE_THICKNESS\0" + "STRIKEOUT_ASCENT\0" + "STRIKEOUT_DESCENT\0" + "ITALIC_ANGLE\0" + "X_HEIGHT\0" + "QUAD_WIDTH\0" + "WEIGHT\0" + "POINT_SIZE\0" + "RESOLUTION\0" + "COPYRIGHT\0" + "NOTICE\0" + "FONT_NAME\0" + "FAMILY_NAME\0" + "FULL_NAME\0" + "CAP_HEIGHT\0" + "WM_CLASS\0" + "WM_TRANSIENT_FOR\0" +; + +static const gint xatoms_offset[] = { + 0, 5, 13, 23, 27, 32, 39, 48, 57, 64, 76, 88, + 100, 112, 124, 136, 148, 160, 169, 174, 182, 189, 195, 205, + 222, 236, 249, 262, 278, 291, 305, 317, 324, 333, 340, 351, + 360, 378, 391, 404, 412, 428, 442, 456, 466, 477, 487, 497, + 511, 525, 537, 549, 568, 588, 605, 623, 636, 645, 656, 663, + 674, 685, 695, 702, 712, 724, 734, 745, 754 +}; + +#define N_CUSTOM_PREDEFINED 1 + +static void +ensure_atom_tables (void) { + int i; + + if (names_to_atoms) + return; + + names_to_atoms = g_hash_table_new (g_str_hash, g_str_equal); + atoms_to_names = g_ptr_array_sized_new (G_N_ELEMENTS (xatoms_offset)); + + for (i = 0; i < G_N_ELEMENTS (xatoms_offset); i++) + { + g_hash_table_insert(names_to_atoms, (gchar *)xatoms_string + xatoms_offset[i], GINT_TO_POINTER (i)); + g_ptr_array_add(atoms_to_names, (gchar *)xatoms_string + xatoms_offset[i]); + } +} + +static GdkAtom +intern_atom_internal (const gchar *atom_name, gboolean allocate) +{ + gpointer result; + gchar *name; g_return_val_if_fail (atom_name != NULL, GDK_NONE); - /* FIXME: Implement */ - return GDK_NONE; + ensure_atom_tables (); + + if (g_hash_table_lookup_extended (names_to_atoms, atom_name, NULL, &result)) + return result; + + result = GINT_TO_POINTER (atoms_to_names->len); + name = allocate ? g_strdup (atom_name) : (gchar *)allocate; + g_hash_table_insert(names_to_atoms, name, result); + g_ptr_array_add(atoms_to_names, name); + + return result; +} + +GdkAtom +gdk_atom_intern (const gchar *atom_name, + gboolean only_if_exists) +{ + return intern_atom_internal (atom_name, TRUE); } GdkAtom gdk_atom_intern_static_string (const gchar *atom_name) { - g_return_val_if_fail (atom_name != NULL, GDK_NONE); - - /* FIXME: Implement */ - return GDK_NONE; + return intern_atom_internal (atom_name, FALSE); } gchar * gdk_atom_name (GdkAtom atom) { - /* FIXME: Implement */ - return NULL; + if (!atoms_to_names) + return NULL; + + if (GPOINTER_TO_INT (atom) >= atoms_to_names->len) + return NULL; + + return g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)); } void -- 2.30.2